From 78c03bebb389bda9817b73a2ed9386ddf4273fa5 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 27 Feb 2017 17:35:32 +0000 Subject: [PATCH] xl: call libxl_vncviewer_exec in main_vncviewer We will need to move main_vncviewer to a different file where it has no access to the helper vncviewer. Call libxl_vncviewer_exec directly. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- tools/xl/xl_cmdimpl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/xl/xl_cmdimpl.c b/tools/xl/xl_cmdimpl.c index 26fd4ab0f5..a42b972d60 100644 --- a/tools/xl/xl_cmdimpl.c +++ b/tools/xl/xl_cmdimpl.c @@ -1120,9 +1120,10 @@ int main_vncviewer(int argc, char **argv) domid = find_domain(argv[optind]); - if (vncviewer(domid, autopass)) - return EXIT_FAILURE; - return EXIT_SUCCESS; + libxl_vncviewer_exec(ctx, domid, autopass); + fprintf(stderr, "Unable to execute vncviewer\n"); + + return EXIT_FAILURE; } static void pause_domain(uint32_t domid) -- 2.30.2